From: Kenichi Handa <handa@m17n.org>
Date: Wed, 27 Jan 2010 05:23:52 +0000 (+0900)
Subject: from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7006^2~85
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=530875b49230779531b7a0508c98540f86f127ec;p=emacs.git

from trunk
---

530875b49230779531b7a0508c98540f86f127ec
diff --cc src/ChangeLog
index 2448967c52d,1b41392c3ce..35a5fd6e4a0
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2010-01-27  Kenichi Handa  <handa@m17n.org>
 +
 +	* regex.c (analyse_first): Fix setting of fastmap for unibyte
 +	pattern string.
 +
+ 2010-01-27  David De La Harpe Golden  <david@harpegolden.net>
+ 
+ 	* fileio.c (Frename_file): Call copy-directory and
+ 	delete-directory for directories, in order to handle cross-device
+ 	renaming (Bug#3353).
+ 
  2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
  
  	* xfns.c (Fx_create_frame): If frame height is too big, try